Fix Counting Problems